Add missing invalidating props and some cleanup