Generator option fixes