Leftover things for commit 1.3.