Fixed a few mino issues