Bugfixes: allow file to be compiled.