Compilation and bug fix.