Fixes for minor bugs introduced with the last build's changes.