[PATCH 0/2] bootstd: Fix a few minor bugs