Some secondary improvements