Fix build issues and starting from scratch