Compatibility fixes, don't search wider than 2*pi, const madness