Fixes by c24b.