Fixed some issue with building th project.