Fix all errors
Fix all slight difference