Merge branch 'address-fixmes' into 'master'

Address some fixmes in the code

See merge request !109