Update with bug fixes