small captive form fixes