couple of fixes to make the ZK demo work better