Fixes for input groups