Edits to get it to run on non-dev box.