Fixed bugs introduced after removal of properties