Fixes for robbing