fixes
handle new stuff in 2.0: schemes