Added back Main-only tweaks