Patch 12

B257 and minor fixes