fix errors moving to master