SSLR-256 Minor fixes and add the old implementation for comparison purposes