Minor fixes to make things work in Jekyll v2.x