Fixed a few methods