Fix essentials for later versions