final bug fixes on navigation properties