Fixing some init errors