Fixed compile-time warnings