Merged remote fixes