couple fix ups