Fix few functions