Bug fix, build portability