Pull fixes back to master