Updates from Chris j3-rest-api repo