Fixes in BP-Schema-tools