[Finish #44085575] Get rid of some minor flaws