Fixes for sherrif