small fixes, combined server pipeline