Cleanup and do -r1 with qt fixes