* Keep fixing travis
 * Fix more lint warnings