next little fixes