Small batch fixes