Giving up on manual specialization.
Additional comp. params and fixes for warnings.