Fix type definitions

and change step adapt initialization