More cleanups + fix a bug when taking a write fault on a mapping that uses