Simple bug fixes found once testing against latest firmware.