Some post commit fixups