Fixes for bad merge...