Fixes for compiling