Fixed some confusing missmatch between init functions