Fixes for fixes for fixes