Merge "Small preventative fixes/refactors" into main