Fix stuff

Fixed stuff to be able to pull.