Bugfixes from PG game