Minor fixes in project