Fixed more warnings