Minor form fixes