Build fixes for 0.5