1.5 regressions

Fixes for regressions in 1.5.4

Would really appreciate help in testing and comments