Area implementation fixes