Bugfix: correct init bugs