Added compatibility and fixed typos