Minor fixture cleanup