Fixes some variable uses.
Grep for 'FIXME' -- there is a few questions on unfixed issues.