store: Some form fixes