Committing some minor tweaks before searching back through commits for whatever broke LARJ+HMC