command/insert fixes