More simple improvements