fix stuff that should have been in #542

somehow PR #542 automerged two weeks ago, despite tests failing. our CI situation is messed up. i gotta fix that. anyway here's wonderwall