Fix errors
Merge branch 'fix_ntp'