Some additional fixes with offline DB