* More Init fixes