The Attic: Bug fixes

Bug fixes