fixes to make gout compile fully