Develop

Fixes for type inprecisions.