Small formay fixes