Fixed compile/build issues