Fixed issues raised by Pandora