Merge "Fix two errors reported by continous test"