Some (big) fixes