Fixes for console ViM + linux Makefile.