A few speed improvements.