Some nice fixes