Baseform fixes