Fixes for new Jekyll