Changes to template_periph_16b to compile (more or less) cleanly