Some fixes to 1.3.0.3