make fixes (untested)