Generator Fixes