several small fixies