Minor changes for slight speed improvements