Merge "Fix some inset issues"