Minor update
Bug fixes