1.0.3 fixes
1.0.3 fixes