Small uncompilable things changed