[DEP-16] Few little bugs fixed