Build Fixes

Signed-off-by: Paul Sparkes <paul@objectivedesign.co.uk>