Add more misc. modifications.