some fixes for base crud