Extra fixes