Various fixes and what not from UA testing