Squash some warnings
Squash more warnings