Fix compilation and bunny