Behind the scenes tweaks