Some admin work and text_response workaround