Feature/misc simple fixes