Code fixups from solution