Fixes for GSL 1.16