Reverted one change from "Fix some compile warnings"