Fixed some methods