Strictify shiv