GAIM: Items to be fixed
------------------------
