Minor issues fix