Improvements to input rendering fix