[#64] Left over small changes