EMbC 1.9.4

Bug fixes

Minor improvements