Fixes for fixes