Fixed some v0.4 warnings