small fixes, removed Federation stub