Some minor tweaking that may be useless