Add some small fixes.