Fixes for tech3