Minor modifiactions to allow for compile