Fixes, more ignores