Bind adjustments, some fixes