compilation fixes (see #226)