Fix some issue with using ChipInit and update final form