Fixes for bugs in the last push.