Fix up the project a bit