Checkup and fixes