Move more non-apache version specific changes to the top