Removed some compiler warnings