Fix.
Fix some issues