GitHub #229: initialization updates