Cleaned up some warnings where functions did not return values