Miscellaneous fixes for game components