Updating from BS12

Just some fixes.