Small fixes to help generator