Minor fixes:
	- Removed unnecessary variables in action scripts
	- #1501
	- #1502