Fixes to account for all system rewrites