more miscellaneous fixes ;_;