small fixes
merge fix