Fix first few errors