Minor changes to Puck