Pandora build fixes (and test)