Sorted out compiler warnings