Fixes around area object selection