Fix type instance init issues