Fix some troubles with first init