Fixes for difference error