A few logical fixes.