Fixes to torch after project structure changes