Merge "Fix two flag usages that I missed the last time around when I refactored it into the utilities class." into main