Include, compiler fixes