Attempting to fix issues with resolving nullable foreign keys.