Minor update and fix