Fix the last bugs