Some miscellaneous fixes
Compiled Version
Merge master into compiled