bootstrapushka fixes