Cleared up warnings