Production to 0.5.3

Small fixes