Minor SKV fixes
PersistentMap: perform simpler test first
Fix linking against skv