fix misc. issues