Preliminary post-Uhack changes