Types: fixing compile errors