Some small bugs, fixed #2
Merge branch 'master' of git.cs.unc.edu:pavel/FasTC