Resolved some compiled errors