Init fixes .. *sigh*
Init fixes .. *sigh*