Fixed compililation errors