Some more fixes...

A couple more fixes -- should be self-explanatory.