Fixing some behavior bugs when times get tough