Final final fixes