Intent errors fix