Few Error fixes