[BUGFIX] Few fixes - name, ...