Fix some issues with the #11 fix.