more limit issue fixes