Squash some warnings
merge heads