Merge branch 'fixed_conv_multiple_files' into 'main'

Fixed point conversions of few files.

See merge request !25