Small steps towards CCodeGen -- Fixing type issues