some attachment fixes