Yet another fixes for merge mess