Warning fixups