more fixes for broken builds