Small fixes. Trying to play with a jQuery based validator and failing hard.
Merge remote-tracking branch 'origin/master'