Quick fixes for merge