Initial jet lagged code review fixes for #12