Fixes to make project easily runnable