Some fixes for if the attribute is empty.