Scaling fixed in AOIHandler and WSHandler