Added fixes regarding Kamil's comments