some late fixes for the 0.5.0 beta