Fixed movement for HTs and a workaround for defend-build bug