Small fixes for #34