Small fixes added