Sorted out warnings