Changes to be compatible with melpa