A few more changes due to the libopencm3 merge