Join Bug Fixes