Fixes for CodeCamp LA 2014