fixes for play