fix of various issues