Fixed bugs introduced by the separate schema setup