Fix breakage of objects