some fixes for cgit forms