Various tidy ups and fixes
Adding BuildTools