Merged in misc_fixes branch.