Build: Tiny tidy up, still just a hack