Connect Fixes