Last tweaks prior to initial test on EMR