Fixes for [FUSEIDE #102 #101 #98 #97]