Fixes and improvements to offline player handling

Fixes and improvements to offline player handling