Minor fixes? (Are these not live yet?)