add  missing glue2 attributes and apply bug fixes