Fixed two errors detected