Fixed bugs in self-damage commit
Merge branch 'master' into racks