Fix for issue #294 and other clean-ups related to ZK installation