Few fixes
Fixed some methods