Refine boot logic; should address issue #68