compile fixes
leo: more compile fixes