Fixed compiler warnings and whitespaces.
Merge.