more fixes for compiling