Fixing pre-Ch 1 bugs