Some small fix
Merge