fixups (thanks @nyuszika7h! (no, not really :p))