Damp and Hammer fixes