Addressing initial run crashes. Under umbrella of #19 and #15