Some clean and little fixes