More fixes to flot folder