Improved SSL support and variable adjustment