auto-paddle and custom paddle fixes