Fix Julian Bradfields' issues.