Fixed issues with attachment management