Corrections based on updates to master