Fixed compilation issues after schema changes