Three patches at James' request