Controller tweaks