ES: Fixed compile errors