Further commits from João.