Fix import bookmarks, import supp files, fix custom types

Change-Id: If2cb442e211abea5381037777f9893c0f5501708