Codelab misc changes