Small final fixes