jspc: mods for f18 build