Small support form fixes