Fix strict compatibility and fix adding group attribute into input