Happy number fixes for 2.7