Minor issues fixed