minor 2.4 patch edits