various fixing from following the codelab step by step [on Linux]