Fixes

More minor fixes

See diff, commits description and #107 & #105