Fixes for fixes.