A couple of patches for Model#touch and compiled viking.js