Fix few mistakes