Small fixes to fit new project