Fix a bug and move compilation of commant-t