Adds fixes from master in testing