GetById fixes