Minor adjustments to be compliant with https://github.com/dougmitarotonda/plyr fix