Few fixes (maybe done wrong).