Fixing small issues in compilation