Some fixes for previous master merge commits