Some small speed edits