Build fixes for gcc