Put some stuff back where it belongs