Cleaned up some compiler warnings