Compilation fixes (bug #282)