fixes for fixes