A couple more optimhacks