Small fixes for #332