Addressed some of the issues raised by John McCabe-Dansted when building