Utilities fixes