Fix ordering issues and ruby non-availability