Fixes to temporary changes.