Fix every little things