FIx a few errors