Fixed bugs from cherrypicks