Some fixes + TAIO2014