fixed issues with models / types missing