Fixing of different small bugs after performance updates.
Merge branch 'c1_aug2012' of github.com:openfaces/OpenFaces into c1_aug2012