make fixes for merge