pre object review fixes