Voxer's fork of stud - fixes for issues we found in our production operation