minor fastpath changes