fix a few more issues on bring-up