Some changes that had been laying around for shovey fixes