Merged second half of easy edits from GPF