Committed other bug fixes in Player