Fixes for Marine Facility, UserInfo and generic extended resources