more crypto fixes