Emitter table and some upload bugs