Fixed 2 minor bugs
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service into vopc