Fixing files for compile issue