Fixes from BP-Schema-tools