Fix double initialization + configuration fix