Few fixes fixed