Fixed bootstrapMacro calls.