FINAL fixes