changes to make compiler work with master