Slight speed improvements