org fixes