fixes for v11 folder