Fixes for Release 1.0.4.1