Fixed a few more warnings in the code.