MEDIUM / Fixed some compile issues