Bug fixes with Pigeon (School)