Fixes on Initializer