Improved handling of puck possession