Fix stuff for compiling