Limit fixes