Various fix ups