nice fixes