Minor changes and fixups