Clean up various issues and fix for fillet deployment