Fixed warnings regarding a few functions