little fixes to get it to be mergable