Slight cleanup on recent pull req + changing versions up