v0.5 Small fixes