More Solidworks Fixes