diff controller fixes