[Jimmt] Final changes.