Minor side-effects fix