A few more ignore fixes and reupadtes of master.