Minor fixes with alias (made functions private)