Integration of issues addressed by jpklein