Elimated most warnings