Small fixes
Schema changes