Merge remote fixes