Patches work, safe to merge