Fixed ds/any
Various fixes