Updated build configuration
Tidy-ups