Fixes to challenge problems by Brandon yesterday.
These are ported over from master branch.