Stand alone project fixes