Tweak origin stuff