Buildfix and improvements to Pandora