Fixing some behavior bugs when times get tough
Merge branch 'master' into feature