more compile fixes (F9)