Remove some more crypto ifdef, fix a few small bugs