firmware: minor clean-ups