A few more minor issue fixes.