fixes for broken build