minor fix
merged fixes