Fixes for GAFObject