Fixes for latest version of Jekyll (and its dependencies)