small fix ups