Another final fixes