small fixes to merged