0.5.1 Various fixes