misc prepare for Play fixes