Bugfixes after deploying to roberts ipod