Attempted to eliminate all compile issues. Lets see if there's any
difference.