fixed some issues from dry run enforcement