Added fixes for these sniffs