Fixed compile issues...