Fixes for diff