Fix some problems
Fix some problems