Fixed some compilation failures