Small initial improvements