[CLUCK] A couple fixes.