Peripheral support and other fixes