pull fixes for merge