Fixes for last two commits.