Runtime and data issues fixed