Minor changes and fix HAVE_LCD_FLIP