a few trivial hacks