Fixed more warnings and errors