Minor cap modifications