checkUsage fixes