Fixes for switching to root.