little fixes to make project work as expected