Various fixes to PKB vector to set #95