Fixed some issues in playstate