A few minor corrections so that it builds