Fixes for attributelist