Updates from jcodings.