Fix some issues with incomplete code.