fixed issues after generation.