Fixes from master-> dev