Cleaned up some warnings... yay!