Pandora compile fixes