Try to bring repo closer to CorsixTH upstream repo