include fix, minor fixes