Some minor speed ups (43.8)