fix two errors according to sona