Fixes attribute references