few small form fixes