Fix last bugs.