[fix] Various errors...