Attemping some damage control