Re-enable PiInTheSky (not using it but that's ok), and fix some stuff.