more small org fixes