fixes on master