378.04 Fixes to issues #26, #28, #35, #39, #50