Some methods fixed