Predemo fixes