Fix some Script extension issues