Minor bugfixes
Script to auto-generate a control.in.