rebuild fixes