misc. fixes found while working