Fixes to implement zendtech #105