Fixes for WHMCS