Fixed more ivars