Fix stuff, compact into one request