Fixed Building Key stuff and WaterMarker bug fix