Fixes in our code for previous master merge