Fixed a couple methods