Fixing some methods