Fix some interface (loading state)