Removing some compiler warnings