Fix more case-sensitive cases
Merge branch 'binary' into experimental