Fixes of issues