few overflows fixed