Fixes to match teh C headers