Fixes at dandy