Propogating bug fixes to experimental branch