Few fixes (Oops)