Fixed some compilation nits