Fixes for v1.0.3