Additional F18 fixes
Merge pull request #47 from kraman/f18_fixes

Additional F18 fixes