Eliminated a few more warnings