Touch ups on ported model factories