Project fixes

Miscellaneous fixes.