Missed some compile issues...