Fixes for join patterns
Cleanup