Additional fixes for compiling