Few more little fixes