Use packrat with packrat :) + bug fixes