Minor movearounds and fixes