Fixes keywords and inheritance