Areas and some other fixes