Alex Atkin's Bug Suggestion Fixes