Minor fixes to a mangled function