Fixes to make the inline form work almost identically to how it should