Some Easter Bunny fixes