Fixes. Please review last two commits.