Quackster More fixes