Tweak the rebuild validation and messages to help debugging