Non-max suppression fixes