Fixed small issues founded after merging