Fixes for the attributes method mostly