Final fix commit for project