Fix few bugs (again)