gznbd fixes

Please, merge the following gznbd fixes.
Thank you in advance!