fixes to exclude