Fixes for ml5 into master