Minor fixes and box.com support.