Update with misc. fix