Necessary fixes