fixes on merge