Random fixes, and merge from bb10