* Multiple fixes. Thanks iryston.