Fixes for Jekyll 2.3