Some fixes to make project runnable