A few more fixups