Little bit of tidy up, refs #298
Update build