Crystalball fixes