Quick fixes to get the project working from scratch