Cleaned up some warnings, blocked no code.