Small fixes for #12