Bugs - Cleanup and helper height adjustments.