Fix few errors