Fix compile errors, warnings that stop build :)