Minor bugfixes, project requirements