build fix in options
and cleanup