Mishmash (client-side changes and server-side fixes)