Base form fixes