Fix recommendations from jone and phgross