fixing typescript errors;