Fixed several issues from today's flurry of code changes.