Misc project fixes