#2 Cleaned up some compiler warnings