Bringing back additional tweaks from KAC work today