Fixed issues in object dependencies