some nice fixes