Changes after merge, some things still broken.