Few more fixups