Minor issues fixed!