Attempted to eliminate all compile issues. Lets see if there's any
difference.
Merge branch 'u1618-FixedBuildErrors' into u1618-ImplementedGlowstone