Fixes for new GameLibrary