Further build tidy ups