Minor changes, temporarily disabling mem limits