Misc changes to the pi