Fixes from OnlineObjects