Build fixes for 1.6