Fixed includes.
Fixed log issues.