first fixes, tests break