Attribute binding fixes.