Bug 861715 - Fixes for birch & cypress. r=catlee