Some speed ups