more intent fixes