Demolish & Build 2017: New patch r124

Small fixes