fix object references