Fixes by BZ