Fixed more compile errors. (+1 squashed commits)

Squashed commits:

[ba8d191] Fixed compile error.