Eliminated some compiler warnings