Fixing the latests bugs.