Minor rebuild fixes