A number of different fixes needed to get the nightly build to work. Includes also !921 (closed) and !920 (closed) Also include conda packaging