Some small fixes
Base initialize