more attribute fixes