Fixes to Play code