general fixes schema