Some project fixes