kasan fixes mostly