Many little fixes