quick incidental fixes