Allow loose STLs
Fixed merge conflicts