Better handling of fenced blocks